* mail/smtpmail.el (smtpmail-via-smtp): Fix STARTTLS detection.

Fixes: debbugs:9615

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 50dccb43b3b42b9c6d6382f0f12a253b16b0afdc..8bbb7f5fcc85c886398dbe07a7115ceb1282ca29 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * mail/smtpmail.el (smtpmail-via-smtp): Fix STARTTLS detection
+       (bug#9615).
+
 2011-09-27  Chong Yidong  <cyd@stupidchicken.com>
 
        * emacs-lisp/package.el (list-packages): Fix echo area message.

diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 1c6f2c7b7ed33aa8ca8d9d8c4d6003860282b69c..edcc82011afbf2f343b9f83f54500a6629dddfe9 100644 (file)
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -658,7 +658,7 @@ The list is in preference order.")
                   :always-query-capabilities t
                   :starttls-function
                   (lambda (capabilities)
-                    (and (string-match "-STARTTLS" capabilities)
+                    (and (string-match "[ -]STARTTLS" capabilities)
                          "STARTTLS\r\n"))
                   :client-certificate t
                   :use-starttls-if-possible t)))